From 80a7e7eaa177af948b1f4cc954bf2d39ee182724 Mon Sep 17 00:00:00 2001 From: Ian Campbell Date: Thu, 10 Oct 2013 15:43:44 +0100 Subject: [PATCH] xen: arm: correctly round down MFN to 1GB boundary make sure pagetable mask macros as physaddr size ~FIRST_MASK is nothing like correct for rounding down an MFN. It is the inverse *and* an address not a framenumber so wrong in every dimension! We cannot use FIRST_MASK since that would mask off any zeroeth level bits. Instead calculate the correct value from FIRST_SIZE. Signed-off-by: Ian Campbell Acked-by: Julien Grall --- xen/arch/arm/mm.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xen/arch/arm/mm.c b/xen/arch/arm/mm.c index 1773ffe3b5..123280e826 100644 --- a/xen/arch/arm/mm.c +++ b/xen/arch/arm/mm.c @@ -639,7 +639,7 @@ void __init setup_xenheap_mappings(unsigned long base_mfn, end_mfn = base_mfn + nr_mfns; /* Align to previous 1GB boundary */ - base_mfn &= ~FIRST_MASK; + base_mfn &= ~((FIRST_SIZE>>PAGE_SHIFT)-1); offset = base_mfn - xenheap_mfn_start; vaddr = DIRECTMAP_VIRT_START + offset*PAGE_SIZE; -- 2.30.2